From: Colin Walters <walters@verbum.org>
Date: Wed, 11 Mar 2015 19:58:42 +0000 (-0400)
Subject: build: Use both pkg-config and AM_PATH_GPGME
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~853
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c732178a4376ce6baf7b5064fb86e0a6c2bf53c1;p=ostree.git

build: Use both pkg-config and AM_PATH_GPGME

Apparently OpenEmbeddeded only supports pkg-config (and includes
gpgme.pc in its content), and Fedora only has the latter.  So do both.
---

diff --git a/configure.ac b/configure.ac
index 5cb2bd02..37742f04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,14 +100,14 @@ AM_CONDITIONAL(BUILDOPT_INTROSPECTION, test "x$found_introspection" = xyes)
 
 LIBGPGME_DEPENDENCY="1.1.8"
 
-m4_ifdef([AM_PATH_GPGME], [
-   AM_PATH_GPGME($LIBGPGME_DEPENDENCY, have_gpgme=yes, have_gpgme=no)
-   ],[ have_gpgme=no ])
+PKG_CHECK_MODULES(OT_DEP_GPGME, gpgme >= $LIBGPGME_DEPENDENCY, have_gpgme=yes, [
+    m4_ifdef([AM_PATH_GPGME], [
+       AM_PATH_GPGME($LIBGPGME_DEPENDENCY, have_gpgme=yes, have_gpgme=no)
+    ],[ have_gpgme=no ])
+])
 AS_IF([ test x$have_gpgme = xno ], [
-   AC_MSG_ERROR([
-
-   Need GPGME version $LIBGPGME_DEPENDENCY or later
-])])
+   AC_MSG_ERROR([Need GPGME version $LIBGPGME_DEPENDENCY or later])
+])
 OSTREE_FEATURES="$OSTREE_FEATURES +gpgme"
 
 LIBARCHIVE_DEPENDENCY="libarchive >= 2.8.0"